From: Kenichi Handa <handa@m17n.org>
Date: Wed, 15 Feb 2012 00:36:50 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~733^2~2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f1830f26ddb87b4658c5fab1b154914461e1037f;p=emacs.git

merge trunk
---

f1830f26ddb87b4658c5fab1b154914461e1037f